merge

diff --cc tools/check/check_hotplug
index 999c7d8e2e8aa2d3aade4feeaeefef9c36a49c92,ba3a80f415b7bccedc4d087d1faef339573028e4..999c7d8e2e8aa2d3aade4feeaeefef9c36a49c92
mode 100644,100755..100755
--- 1/tools/check/check_hotplug
--- 2/tools/check/check_hotplug
+++ b/tools/check/check_hotplug

diff --cc xen/arch/x86/shadow.c
Simple merge

diff --cc xen/arch/x86/shadow32.c
Simple merge

diff --cc xen/arch/x86/shadow_public.c
Simple merge

diff --cc xen/common/grant_table.c
Simple merge

diff --cc xen/include/asm-x86/shadow.h
Simple merge